From: Andrew Cooper Date: Mon, 26 Sep 2022 13:02:13 +0000 (+0100) Subject: CI: Force CONFIG_XEN_IBT in the buster-gcc-ibt test X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~176 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=211d8419ef8d8a237ff914fd8304b8fefc3ff2cc;p=xen.git CI: Force CONFIG_XEN_IBT in the buster-gcc-ibt test buster-gcc-ibt is a dedicated test to run a not-yet-upstreamed compiler patch which is relevant to CONFIG_XEN_IBT in 4.17 and later. Force it on, rather than having 50% of the jobs not testing what they're supposed to be testing. Fixes: 5d59421815d5 ("x86: Use control flow typechecking where possible") Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini [stefano: minor code style improvement] Signed-off-by: Stefano Stabellini --- diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index a39ed72aac..ddc2234faf 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -299,6 +299,8 @@ debian-buster-gcc-ibt: variables: CONTAINER: debian:buster-gcc-ibt RANDCONFIG: y + EXTRA_FIXED_RANDCONFIG: | + CONFIG_XEN_IBT=y debian-unstable-clang: extends: .clang-x86-64-build diff --git a/automation/scripts/build b/automation/scripts/build index bcfa6838f0..8c0882f3aa 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -12,6 +12,12 @@ cc-ver() # random config or default config if [[ "${RANDCONFIG}" == "y" ]]; then + + # Append job-specific fixed configuration + if [[ -n "${EXTRA_FIXED_RANDCONFIG}" ]]; then + echo "${EXTRA_FIXED_RANDCONFIG}" >> xen/tools/kconfig/allrandom.config + fi + make -j$(nproc) -C xen KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config randconfig hypervisor_only="y" else